From 911029bbefd9b4dd29ae31ef64494a1e6fcaa64a Mon Sep 17 00:00:00 2001 From: "vh249@arcadians.cl.cam.ac.uk" Date: Sat, 10 Sep 2005 14:41:16 +0000 Subject: [PATCH] remove pointless NULL check before calling kfree Signed-off-by: Vincent Hanquez --- linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c | 6 ++---- linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c | 3 +-- linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c | 6 ++---- linux-2.6-xen-sparse/drivers/xen/netback/loopback.c | 6 ++---- linux-2.6-xen-sparse/drivers/xen/netback/xenbus.c | 6 ++---- linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c | 3 +-- linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c | 4 +--- linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c | 6 ++---- linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c | 3 +-- linux-2.6-xen-sparse/drivers/xen/usbback/usbback.c | 3 +-- linux-2.6-xen-sparse/drivers/xen/usbfront/usbfront.c | 3 +-- 11 files changed, 16 insertions(+), 33 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c index 0872124919..5a96b54f03 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c @@ -48,8 +48,7 @@ static int blkback_remove(struct xenbus_device *dev) unregister_xenbus_watch(&be->backend_watch); if (be->blkif) blkif_put(be->blkif); - if (be->frontpath) - kfree(be->frontpath); + kfree(be->frontpath); kfree(be); return 0; } @@ -255,8 +254,7 @@ static int blkback_probe(struct xenbus_device *dev, free_be: if (be->backend_watch.node) unregister_xenbus_watch(&be->backend_watch); - if (frontend) - kfree(frontend); + kfree(frontend); kfree(be); return err; } diff --git a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c index 16f7657400..ce90bea732 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c @@ -608,8 +608,7 @@ static int talk_to_backend(struct xenbus_device *dev, } out: - if (backend) - kfree(backend); + kfree(backend); return err; abort_transaction: diff --git a/linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c b/linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c index 06d07cacf1..eeaaa0c283 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c +++ b/linux-2.6-xen-sparse/drivers/xen/blktap/xenbus.c @@ -52,8 +52,7 @@ static int blkback_remove(struct xenbus_device *dev) unregister_xenbus_watch(&be->backend_watch); if (be->blkif) blkif_put(be->blkif); - if (be->frontpath) - kfree(be->frontpath); + kfree(be->frontpath); kfree(be); return 0; } @@ -200,8 +199,7 @@ static int blkback_probe(struct xenbus_device *dev, free_be: if (be->backend_watch.node) unregister_xenbus_watch(&be->backend_watch); - if (frontend) - kfree(frontend); + kfree(frontend); kfree(be); return err; } diff --git a/linux-2.6-xen-sparse/drivers/xen/netback/loopback.c b/linux-2.6-xen-sparse/drivers/xen/netback/loopback.c index 9845ba32cc..09e29ae5dc 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netback/loopback.c +++ b/linux-2.6-xen-sparse/drivers/xen/netback/loopback.c @@ -160,10 +160,8 @@ static int __init make_loopback(int i) return 0; fail: - if (dev1 != NULL) - kfree(dev1); - if (dev2 != NULL) - kfree(dev2); + kfree(dev1); + kfree(dev2); return err; } diff --git a/linux-2.6-xen-sparse/drivers/xen/netback/xenbus.c b/linux-2.6-xen-sparse/drivers/xen/netback/xenbus.c index 80050f9c18..b13ce8bc51 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netback/xenbus.c +++ b/linux-2.6-xen-sparse/drivers/xen/netback/xenbus.c @@ -50,8 +50,7 @@ static int netback_remove(struct xenbus_device *dev) unregister_xenbus_watch(&be->backend_watch); if (be->netif) netif_disconnect(be->netif); - if (be->frontpath) - kfree(be->frontpath); + kfree(be->frontpath); kfree(be); return 0; } @@ -270,8 +269,7 @@ static int netback_probe(struct xenbus_device *dev, free_be: if (be->backend_watch.node) unregister_xenbus_watch(&be->backend_watch); - if (frontend) - kfree(frontend); + kfree(frontend); kfree(be); return err; } diff --git a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c index e31434ac12..6cd026a678 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c @@ -1232,8 +1232,7 @@ static int talk_to_backend(struct xenbus_device *dev, netif_state = NETIF_STATE_CONNECTED; out: - if (backend) - kfree(backend); + kfree(backend); return err; abort_transaction: diff --git a/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c b/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c index 1caaca4998..593a2c7609 100644 --- a/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c +++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c @@ -148,9 +148,7 @@ static void inline packet_free(struct packet *pak) { del_singleshot_timer_sync(&pak->processing_timer); - if (pak->data_buffer) { - kfree(pak->data_buffer); - } + kfree(pak->data_buffer); /* * cannot do tpmif_put(pak->tpmif); bad things happen * on the last tpmif_put() diff --git a/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c b/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c index 4e2a11f838..2bebc07f81 100644 --- a/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c +++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c @@ -52,8 +52,7 @@ static int tpmback_remove(struct xenbus_device *dev) tpmif_put(be->tpmif); } - if (be->frontpath) - kfree(be->frontpath); + kfree(be->frontpath); kfree(be); return 0; } @@ -243,8 +242,7 @@ static int tpmback_probe(struct xenbus_device *dev, free_be: if (be->backend_watch.node) unregister_xenbus_watch(&be->backend_watch); - if (frontend) - kfree(frontend); + kfree(frontend); kfree(be); return err; } diff --git a/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c b/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c index 6372382e09..2074a1d8de 100644 --- a/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c +++ b/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c @@ -363,8 +363,7 @@ static int talk_to_backend(struct xenbus_device *dev, } out: - if (backend) - kfree(backend); + kfree(backend); return err; abort_transaction: diff --git a/linux-2.6-xen-sparse/drivers/xen/usbback/usbback.c b/linux-2.6-xen-sparse/drivers/xen/usbback/usbback.c index 043ab73eeb..bd3898bc30 100644 --- a/linux-2.6-xen-sparse/drivers/xen/usbback/usbback.c +++ b/linux-2.6-xen-sparse/drivers/xen/usbback/usbback.c @@ -781,8 +781,7 @@ static void dispatch_usb_io(usbif_priv_t *up, usbif_request_t *req) return; no_mem: - if ( setup != NULL ) - kfree(setup); + kfree(setup); make_response(up, req->id, req->operation, -ENOMEM, 0, 0); return; } diff --git a/linux-2.6-xen-sparse/drivers/xen/usbfront/usbfront.c b/linux-2.6-xen-sparse/drivers/xen/usbfront/usbfront.c index af2d2065df..30d4b38bbd 100644 --- a/linux-2.6-xen-sparse/drivers/xen/usbfront/usbfront.c +++ b/linux-2.6-xen-sparse/drivers/xen/usbfront/usbfront.c @@ -1720,8 +1720,7 @@ static int __init xhci_hcd_init(void) return 0; up_failed: - if (errbuf) - kfree(errbuf); + kfree(errbuf); errbuf_failed: return retval; -- 2.30.2